remove legacy crap