Removed unused code. Added ido-mode