upgrade flamegraph
upgrade rails 4
remove "via sitename" from senders
remove patches that have been upstreamed
clean up rails4 checks so they are consistent