Cleanup and add jsw wrapper install