removed todo tasks in the source code