Removing unsued functions