Tidied up interface by removing unneeded functions.