Removed unnecessary echos