Revert Cleanup: Part 4