Removed some unused routines