remove legacy bullshit