refactor orphan views