Removed unused comments and commented codes !