Added config options for cleanup queue and max attempts
Working on cleanup process