Added the posibility of disabling auto cleanup