diff --git a/wst/trunk/samples/library_server/lib_server.lpi b/wst/trunk/samples/library_server/lib_server.lpi
index 19c12b69f..a270519df 100644
--- a/wst/trunk/samples/library_server/lib_server.lpi
+++ b/wst/trunk/samples/library_server/lib_server.lpi
@@ -4,10 +4,10 @@
     <PathDelim Value="\"/>
     <Version Value="6"/>
     <General>
+      <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
       <IconPath Value=".\"/>
       <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="2"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -25,245 +25,13 @@
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <Units Count="14">
+    <Units Count="1">
       <Unit0>
         <Filename Value="lib_server.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="lib_server"/>
-        <CursorPos X="1" Y="47"/>
-        <TopLine Value="20"/>
-        <EditorIndex Value="0"/>
-        <UsageCount Value="31"/>
-        <Loaded Value="True"/>
       </Unit0>
-      <Unit1>
-        <Filename Value="..\..\library_server_intf.pas"/>
-        <UnitName Value="library_server_intf"/>
-        <CursorPos X="32" Y="91"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="6"/>
-        <UsageCount Value="15"/>
-        <Loaded Value="True"/>
-      </Unit1>
-      <Unit2>
-        <Filename Value="..\user_service_intf_imp.pas"/>
-        <UnitName Value="user_service_intf_imp"/>
-        <CursorPos X="43" Y="179"/>
-        <TopLine Value="157"/>
-        <EditorIndex Value="9"/>
-        <UsageCount Value="15"/>
-        <Loaded Value="True"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="..\..\wst_rtti_filter\rtti_filters.pas"/>
-        <UnitName Value="rtti_filters"/>
-        <CursorPos X="53" Y="43"/>
-        <TopLine Value="184"/>
-        <EditorIndex Value="11"/>
-        <UsageCount Value="15"/>
-        <Loaded Value="True"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="..\user_service_intf_binder.pas"/>
-        <UnitName Value="user_service_intf_binder"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="5"/>
-        <UsageCount Value="15"/>
-        <Loaded Value="True"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="..\..\base_service_intf.pas"/>
-        <UnitName Value="base_service_intf"/>
-        <CursorPos X="3" Y="133"/>
-        <TopLine Value="119"/>
-        <EditorIndex Value="10"/>
-        <UsageCount Value="15"/>
-        <Loaded Value="True"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="..\..\semaphore.pas"/>
-        <UnitName Value="semaphore"/>
-        <CursorPos X="1" Y="137"/>
-        <TopLine Value="113"/>
-        <EditorIndex Value="8"/>
-        <UsageCount Value="15"/>
-        <Loaded Value="True"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="..\..\wst_rtti_filter\cursor_intf.pas"/>
-        <UnitName Value="cursor_intf"/>
-        <CursorPos X="2" Y="13"/>
-        <TopLine Value="34"/>
-        <EditorIndex Value="7"/>
-        <UsageCount Value="13"/>
-        <Loaded Value="True"/>
-      </Unit7>
-      <Unit8>
-        <Filename Value="..\..\..\..\lazarus\lazarus\others_package\indy\indy-10.2.0.1\lazarus\IdDsnCoreResourceStrings.pas"/>
-        <UnitName Value="IdDsnCoreResourceStrings"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="10"/>
-      </Unit8>
-      <Unit9>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <UnitName Value="server_service_json"/>
-        <CursorPos X="3" Y="209"/>
-        <TopLine Value="200"/>
-        <EditorIndex Value="2"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-      </Unit9>
-      <Unit10>
-        <Filename Value="..\..\base_json_formatter.pas"/>
-        <UnitName Value="base_json_formatter"/>
-        <CursorPos X="3" Y="181"/>
-        <TopLine Value="307"/>
-        <EditorIndex Value="4"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-      </Unit10>
-      <Unit11>
-        <Filename Value="..\..\server_service_soap.pas"/>
-        <UnitName Value="server_service_soap"/>
-        <CursorPos X="95" Y="200"/>
-        <TopLine Value="177"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-      </Unit11>
-      <Unit12>
-        <Filename Value="..\..\base_soap_formatter.pas"/>
-        <UnitName Value="base_soap_formatter"/>
-        <CursorPos X="57" Y="129"/>
-        <TopLine Value="115"/>
-        <UsageCount Value="11"/>
-      </Unit12>
-      <Unit13>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <UnitName Value="fpjson"/>
-        <CursorPos X="31" Y="1213"/>
-        <TopLine Value="1199"/>
-        <EditorIndex Value="3"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit13>
     </Units>
-    <JumpHistory Count="28" HistoryIndex="27">
-      <Position1>
-        <Filename Value="lib_server.lpr"/>
-        <Caret Line="22" Column="19" TopLine="19"/>
-      </Position1>
-      <Position2>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="45" Column="34" TopLine="32"/>
-      </Position2>
-      <Position3>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="27" Column="38" TopLine="19"/>
-      </Position3>
-      <Position4>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="32" Column="35" TopLine="31"/>
-      </Position4>
-      <Position5>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="102" Column="1" TopLine="70"/>
-      </Position5>
-      <Position6>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="187" Column="6" TopLine="170"/>
-      </Position6>
-      <Position7>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="188" Column="8" TopLine="171"/>
-      </Position7>
-      <Position8>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="109" Column="1" TopLine="98"/>
-      </Position8>
-      <Position9>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="102" Column="3" TopLine="98"/>
-      </Position9>
-      <Position10>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="32" Column="23" TopLine="31"/>
-      </Position10>
-      <Position11>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="49" Column="36" TopLine="34"/>
-      </Position11>
-      <Position12>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="105" Column="20" TopLine="91"/>
-      </Position12>
-      <Position13>
-        <Filename Value="lib_server.lpr"/>
-        <Caret Line="47" Column="1" TopLine="20"/>
-      </Position13>
-      <Position14>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="150" Column="37" TopLine="136"/>
-      </Position14>
-      <Position15>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <Caret Line="59" Column="14" TopLine="45"/>
-      </Position15>
-      <Position16>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <Caret Line="63" Column="45" TopLine="49"/>
-      </Position16>
-      <Position17>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="151" Column="29" TopLine="136"/>
-      </Position17>
-      <Position18>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <Caret Line="63" Column="42" TopLine="49"/>
-      </Position18>
-      <Position19>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <Caret Line="40" Column="23" TopLine="26"/>
-      </Position19>
-      <Position20>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <Caret Line="63" Column="45" TopLine="49"/>
-      </Position20>
-      <Position21>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <Caret Line="169" Column="14" TopLine="155"/>
-      </Position21>
-      <Position22>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <Caret Line="177" Column="23" TopLine="163"/>
-      </Position22>
-      <Position23>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <Caret Line="273" Column="23" TopLine="259"/>
-      </Position23>
-      <Position24>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <Caret Line="328" Column="60" TopLine="314"/>
-      </Position24>
-      <Position25>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <Caret Line="466" Column="29" TopLine="452"/>
-      </Position25>
-      <Position26>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <Caret Line="673" Column="29" TopLine="659"/>
-      </Position26>
-      <Position27>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="178" Column="36" TopLine="151"/>
-      </Position27>
-      <Position28>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="140" Column="22" TopLine="137"/>
-      </Position28>
-    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
@@ -292,40 +60,4 @@
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
-  <Debugging>
-    <BreakPoints Count="4">
-      <Item1>
-        <Source Value="D:\lazarusClean\fpcsrc\rtl\inc\getopts.pp"/>
-        <Line Value="230"/>
-      </Item1>
-      <Item2>
-        <Source Value="D:\lazarusClean\fpcsrc\rtl\inc\getopts.pp"/>
-        <Line Value="193"/>
-      </Item2>
-      <Item3>
-        <Source Value="D:\lazarusClean\fpcsrc\rtl\inc\getopts.pp"/>
-        <Line Value="198"/>
-      </Item3>
-      <Item4>
-        <Source Value="..\..\ws_helper\wsdl2pas_imp.pas"/>
-        <Line Value="606"/>
-      </Item4>
-    </BreakPoints>
-    <Watches Count="2">
-      <Item1>
-        <Expression Value="locStrFilter"/>
-      </Item1>
-      <Item2>
-        <Expression Value="i"/>
-      </Item2>
-    </Watches>
-    <Exceptions Count="2">
-      <Item1>
-        <Name Value="ECodetoolError"/>
-      </Item1>
-      <Item2>
-        <Name Value="EFOpenError"/>
-      </Item2>
-    </Exceptions>
-  </Debugging>
 </CONFIG>