Multi Path Bug Fixed and Ceaning Code