removing legacy crap