clean comments Fixes BUKKIT-4813, BUKKIT-4285