Revert 60 create performace features