I commented if any chance need to revert to faye. Code cleaned.