Add removeProperty() and other fixes