further clean up for rails4