Removed devise related changes, we are using manual authentication