architecture cleanup