FIX: esp.generation - cleanup of esp-server