cleaning up rails 4 branch