Fixed some Cleanup-Functions