Cleaning up main-om