clean up properties
right version