cleanup + cp support