ENH cleaning up dependencies