Removed obsolute comments and debug messages