Removed some logs and echos