Removed old stuffs