Rat cleanup

Rat cleanup