Cleanup

Sorry This should be the correct pull request.  I feel that the rebase may not have worked properly.  Let me know if you run into issues.

Scott