Some cleanup of the basic sample project that was cloned using f1feeder-part1 repo.