cleaning up api :bath: