Remove more code, fix a bug.