removing some functions