Getting rid of loader-server and loader-agent