clean up auth branch, display, activities admin