Removed legacy support