Remove unnecessary uses