Clean up nonuniform routines.