Cleaned up unused/redundant code and documentation comments.