Restore volume title

Also remove some unused controllers