Part 1 of fixing Dispose methods of solution

Part 1 of fixing Dispose methods of solution