Removed #define debug messages ...