Streamline

Streamlined some analysis files, removing code no longer used for
manuscript.