Some cleanup (remove temporary comments)