Cleaning up leftover bits