Cleanup testing commented code