Removed old code :bomb: