Changed auth sources, cleaned up tables