[UPT] CRAP REMOVAL