Header and project cleanup