removed some functions