added cleanup correctly