should these still be commented out?