Minor cleanups, removed stale code