Removed unecessary standard functions