Revert "added Andrew’s code"

This reverts commit 6a669c5c89edbb03a1c08bd18cfbd453bb4bd6aa.