More rails 4.1.4 cleanup