Fixed subview removal issue