removing some unused functions