Removed legacy references