working on subview cleanup