Remove unnecessary dependencies and comments