Removed comments and unused dependencies