cleaned the preventbarfing stuff