Clean up code in kRPC project