pulling out twisted stuff that didn't work properly anyway