comment out all debug codes and new entity added