Clean up comments and unused dependencies