Removed Redundant things