Remove commented-out code? And how does Javadoc deal with the "double Javadoc" now?