beginning clean up, loose ends, skipped testing