Code cleanup and removal of TODO's
Document forward-2136 option