Can we remove the commented out constants?