No functional changes (I think), lots of code deletion and tidying up.