remove unused comments and add todo: reused current files