removed json; clean up