Removed Unnecessary Things