minor cleanup (remove unnecessary dependencies, etc.)