Some cleanup before going on