Remove unused methods.
Add test methods for obvious code paths.