Fixing cleaup