removing tests and utils.