Removed unncessary functions leftover from tests