Pull request

Remove TODO lines