REDT OK / code to clean up