More tidy up after upgrade to Rails 4