Removed old stuff and corrected localization