cleanup of crap code.