Codebase

Cleaned up old code that was commented out.