removed some comments and other code