Tidying up by removing old code.