Clean up more calls to :complete, update helpers and route scoping