Removed some more bullshit