Added Another cleanup
Revert "Added Another cleanup"

This reverts commit ecaf466de891cd04ddb0457dc420a0bf182987aa.