Remove unused variables and fix pakeage.json