Removed most of the `_old` stuff