Removed functions which weren't really necessary.