Removed some unused borrowed code