|#1034| +RahulK +Shilpi| FT code clean up