Slight refactoring
Remove flotsam