Move terminal cleanup to Drop implementation

Created by  quickdudley  on January 17, 2022
272LZTVTE66SQ4BYDORDIBSQFKG3357ZYIUNPVOGUC47VFXOAKVQC
Change contents