removed crap code