Removed some redundant legacy code