Cleanup after Rails upgrade