Revert "Better comments and custom labels"

This reverts commit b49538502ea1a22274f3fb6ded34cc1ea9559200.