architecture in place, time for some cleanup