removed legacy crap