added subview cleanup