Reverted TODO highlights since they looked bad