Fixing a few glitches and removing the test sample data.