Fixed delete and commented stuff