Cleaned up rpc and sample source removal