Removing some demo / test code