Removed old code
Added necessarry option
Added which util
Started to work on client Facts