Header clean up / remove unused libraries