Removed extra unused functions