removed init order workaround (not required any more)