Should all these properties still be removed. It looks like from your latest commit that they are still in use.