Remove TODO file
Parse loop refactor