removed a lot of bullshit