removing some comments and unnecessary calls