Remove commented-out (non-working) code