removed some disabling comments