Clean up master; prep for in-console interactability