Remove properties that erroneously got merged into trunk