Can we get rid of commented out code sections?