Consider removing the commented out section here.