big clean up, no editor