fixing mono solution and some unused variables.