Removed some leftover code that became unnecessary