cleanup of random legacy crap left over