Removed old clutter