cleanup, switched back to non-minimized version for debugging