[errai-dev] Demo cleanup on the 3.0 branch