Cleanup, added server support