Remove unnecessary cl requires
edts_debug cleanups to prepare for packaging