Code clean, removing some debug messages