removed some functions stuff