Fixed registration again and cleaned up RequestManager