Code clean up for support crons

Code clean up for support crons