Remove unused stuff; start header pic work