Remove unused parts and small gramma and indentaions fixes.