Removed old code, making transitions