simplify worker master usage
remove remaining modelines