cleanup, better fallback rest service