Shorten class and removed old