removed the "cleanup" fucntion, it didnt work