remove some unused commented out things