Removed TODO items from code and put on github