make sure appropriate stuff is commented out