Post 1.5.0.3 cleanup