cleanup for redesign