Some Cleanup
Version Bump