More clean up from redesign