Cleaned up obsolete comments/code.