Remove backwards compatibility