Fix sub requests

remove commented out code