WIP: Remove properties API