EditPropertiesDialog cleaned up