Removed Drawing specific code