Renamed cleaner scripts... blegh, too hacky