Remove code which is not needed for now.
Update the test for the new structure.