Removed Legacy References