Removed old functions left over from the procedural code