Removing useless code, updating TODO