Update to rails 4 and cleanup