Fixed init, removal