Removed debug echo lines