CreepUC cleanup