Removed Legacy Code