Correct weird reference in solution file
Removed unnecessary reference to message
Improved Dispose Methods