Custom Labels update

Commented out custom labels that have hardcoded references