Remove debug echo statements