Rails 4.x

@bquorning @grosser 
nice cleanup :)