Removed some unused functions