design clean up