Minor cleanups to remove obsolete code and add missing change log entry