Remove XBlock dependency.