Corrected Response

Corrected Response
Cleaned up and removed old code