Work.
Minor fixes.
Fix.
Remove unused code.