Remove TODOs from code and add into README