Change: Commenting and rm header file