Cleanup

@charlierudolph removing miscellaneous unused code