Improved comments for works in progress.
Removed dead code.
Throw UnsupportedOperationException for methods that have not been implemented.