Remove previous #fix comments
Code Review