Removed unncessary helper functions