Remove unnecessary utils