Removed a number of superficial functions