Mostly remove gui-based items, a few other cleanups