Removed more clutter!