Delete some code (#3563)

* Delete some code

* removed import

* delete more code
3 files changed