Cleanup + changed how local auth use so it doesn't clash with external auth now.