Removed legacy attributes