Removed unused variables and dependencies.