more cleanup to rails 4