Removed warnings and debugging output