Resolve-Nokia-todo-s

Solving and removing the todo's by Nokia