Refactor: removed quit queue and file marshal
Merge branch 'master' into byebye-quit