Removed usage of RemoveControl() in destructor