cleanup + added sample object