Removed old code and change outdated strings