Removed Deprecated classes