Removed slave and master basedir management