Cleanup and Version Changed

Cleanup and Version Changed