removed unused stuff, made some localization