code clean up
Remove TODOs
More code clean up