now correctly cleaning up