No more spark and universal-events packages