Feature/drop guest

See roadmap issue 35... (part of 3 PRs)