removed obsolete comments and empty lines