Made request options optional. Removed TODOs