fix comments after #include
rm redundant file