Revert "master/slave initial"

This reverts commit 83ff5d019bc1834425e7e3f66af9f74e724b53f1.