Eliminated some debug messages