(fix) fix warnings (no auth) + cleanup