removed some comments
removed some functions