tried to fix empty request
Cleaned up graphs and calls