Cleaned up after JSON implementation.