header-clean-up | Clean up