scd/rm warning/bugfix cleanup