Removed commented out old functions that aren't in use