Clean up properties for modern compiler and runtime