BaseRequest clean up