Remove use of D7, it is used for debugging