removed dependencies on other features