localization and removed unused stuff