Small changes and remove old/done TODOs