Further Deletions

Trimmed down more code that was not in use to clean up and make it
easier to move forward.