cleanup, and make deps more specific