Removed unusued functions