comments and removal of non-needed files