There, this fixes things and prevents hold ups and queue bullshit.
Fixes header and removes unneeded properties and initializers.