Unused comments removed