Clean up properties