jim-ws1 branch - removed unused files