Add server spec. Cleanup.