clean up for redesign