Refactoring and deletion of old example code