Hide the orphans

also includes my refactor PR: just merge this one ;)