removing commented-out code and unnecessary dependencies