E734: ready to merge now

house cleaning complete