Removed debugging info
Fix bugs on source incoming process