Remove extraneous code.
Merge branch 'cleanup'