Cleanup

Cool?