remove special localization and small changes