started cleanup of architecture section