Remove old TODO
Platform refactoring
Minor changes