general cleanup. separated Omdb calls out.