clean out unused code
more testing cleanup
Merge branch 'lloyd'