Removed some remnant code