Simplifications and cleanups.
Remove unused stuff.
Nothing useful here.