Remove outdated code, exceptions and move simplify structure