Removed unecessary function