Header comments removed