Removed unused cleanup.h