Revert "Cleanup. 2."

This reverts commit ba15e21e4d5854871b901ad861071673c070e908.