Remove backwards compatibility check