removed unused comments and codes