fix build path issue, remove client code and defs