Cleaning up after JSON implementation.