Clean up code, remove explicit disposing as it is not needed
Streamline code to make hidden classes happy