Revert "Implement features by Harvey"

This reverts commit 45eba80dfea314d733ef86d15b371e6c7d40761d.