Remove old way of nesting to prepare for mounting logic.