remove am_connected check