merged in @alexdarling changes, removed func def from header file of obsoleted functions