Remove commented-out annotations