remove headers
replace logs onto machen package
clean namespace qualifier