Added some cleanup routines for subviews