Clean up comments. Adds BUKKIT-5437