Removed extraneous leftover code