Removed clutter dependency