fixed request, clenup