Cleanup, remove underscore as it is no longer used by server