Revert " Code Cleanup"