Final cleanup of Rails only code