Kill model saving code for good