Removed obsolete code.
Updated tests.