removed comments/todo's