3.0 cleanup

Based on https://insight.sensiolabs.com/projects/f3740be4-025e-4236-a7db-fc46eee81c32/analyses/2