remove functions from class estate
Merge origin/master