RP-248 Remove orphaned header
RP-132 Add rollover debug message
RP-132 Remove debug and put in fix