core cleanup: debug replacement