Remove unused parts of common authentication