fix and finished debug remove