Adding server, build cleanup