Remove unnecessary data files and minor layout change