Avoid to check for existence of not needed UDFs and minor code adjustment for cleanup() method