Fix init and remove bullshit