Architecture cleanup