cleanup after rails upgrades and twitter upgrade