Removing some unused functions