cleanup, re-enable commented code