Requirements file, and removed self dependencies