Remove Extra fields - Switch to a separate Auth