Cleaned up dead code and comments