Remove left behind imagery, minor cleanups