tidying up cruft