removed logging, fixed removal of TEs for real