Removed redundant logic and dep on json level file