general cleanup and checkin