Removed unnecessary uses